Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 15:45:51 +0000 (08:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 15:45:51 +0000 (08:45 -0700)
commite3b2c16d7f71f41dea8a652cd6b1b0bb0732ce2f
treea1b85abeae333fc708af5409f9e9ebe0267eb704
parent8e1d2c1c343cfa21ea0b944b46eabfe30c5a61b7
parentbb3ca681b5d1a95abd456607c78b556f2bf9f69d
Merge from trunk.